Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: libp2p:bump libp2p version to v0.30 #11434

Merged
merged 7 commits into from
Nov 22, 2023

Conversation

jennijuju
Copy link
Member

libp2p v.0.30 has been integrated in lotus and tested with v1.25.0 train for over a month.

Bringing the libp2p dependency more up to date so that the one in the mandatory release doesn't fall behind too much.

@jennijuju jennijuju marked this pull request as ready for review November 21, 2023 14:14
@jennijuju jennijuju requested a review from a team as a code owner November 21, 2023 14:14
@@ -43,7 +43,7 @@ func (bbr BadBlockReason) String() string {
}

func NewBadBlockCache() *BadBlockCache {
cache, err := lru.NewARC[cid.Cid, BadBlockReason](build.BadBlockCacheSize)
cache, err := arc.NewARC[cid.Cid, BadBlockReason](build.BadBlockCacheSize)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't really need this for the libp2p upgrade, right ? Do you think we can do this in a separate PR ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is cherry-picked from master, probably best to leave it as-is.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes you need this, due to a breaking change in that library introduced in a patch release (see hashicorp/golang-lru#142). I agree that this cherry-pick should be left as is.

@Stebalien Stebalien force-pushed the jen/makemarteenhappy branch from e68cda5 to b78f9ce Compare November 21, 2023 21:34
@Stebalien
Copy link
Member

Ok, so, we're simply not downloading the params in those cases. So... I'm backporting a small change to the unit tests to see if it matters. Otherwise... I'm not sure.

@Stebalien
Copy link
Member

Ok, now both cases should be fixed.

@Stebalien Stebalien force-pushed the jen/makemarteenhappy branch from 464514b to 94787a6 Compare November 21, 2023 22:19
@Stebalien Stebalien force-pushed the jen/makemarteenhappy branch from 94787a6 to c273cbd Compare November 21, 2023 22:29
@aarshkshah1992
Copy link
Contributor

@jennijuju Can we go ahead and merge this ?

@jennijuju
Copy link
Member Author

thank you all!

@jennijuju jennijuju merged commit e73b16b into release/v1.24.0 Nov 22, 2023
87 checks passed
@jennijuju jennijuju deleted the jen/makemarteenhappy branch November 22, 2023 06:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants